From 137fd63882065723ca0215bd560c91ae272c10ad Mon Sep 17 00:00:00 2001 From: robertl Date: Wed, 24 May 2006 15:31:21 +0000 Subject: [PATCH] Remove #if !defined NO_USB since NO_USB is never defined. --- gpsbabel/jeeps/gpsusbcommon.c | 4 ---- gpsbabel/jeeps/gpsusbcommon.h | 2 -- gpsbabel/jeeps/gpsusbstub.c | 2 +- gpsbabel/jeeps/gpsusbwin.c | 2 -- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gpsbabel/jeeps/gpsusbcommon.c b/gpsbabel/jeeps/gpsusbcommon.c index dd72f9203..a75e90f1b 100644 --- a/gpsbabel/jeeps/gpsusbcommon.c +++ b/gpsbabel/jeeps/gpsusbcommon.c @@ -1,4 +1,3 @@ -#if !defined(NO_USB) /* Garmin USB layer - OS independent component. @@ -255,6 +254,3 @@ gusb_syncup(void) } fatal("Unable to establish USB syncup\n"); } - - -#endif /* !defined(NO_USB) */ diff --git a/gpsbabel/jeeps/gpsusbcommon.h b/gpsbabel/jeeps/gpsusbcommon.h index 0293cab49..677e75789 100644 --- a/gpsbabel/jeeps/gpsusbcommon.h +++ b/gpsbabel/jeeps/gpsusbcommon.h @@ -1,4 +1,3 @@ -#if !defined(NO_USB) /* Garmin USB layer - OS independent component. @@ -43,4 +42,3 @@ void gusb_list_units(void); /* Provided by the OS layers */ // int gusb_init(const char *portname, gpsdev **dh); -#endif diff --git a/gpsbabel/jeeps/gpsusbstub.c b/gpsbabel/jeeps/gpsusbstub.c index eb3caa870..27a31c0cd 100644 --- a/gpsbabel/jeeps/gpsusbstub.c +++ b/gpsbabel/jeeps/gpsusbstub.c @@ -31,4 +31,4 @@ gusb_init(const char *portname) fatal(no_usb); } -#endif /* defined(NO_USB) */ +#endif /* defined(HAVE_LIBUSB) */ diff --git a/gpsbabel/jeeps/gpsusbwin.c b/gpsbabel/jeeps/gpsusbwin.c index adb72bf43..8e003ea44 100644 --- a/gpsbabel/jeeps/gpsusbwin.c +++ b/gpsbabel/jeeps/gpsusbwin.c @@ -1,4 +1,3 @@ -#if !defined(NO_USB) /* Windows layer of Garmin/USB protocol. @@ -258,4 +257,3 @@ gusb_init(const char *pname, gpsdevh **dh) exit (0); } -#endif /* !defined(NO_USB) */ -- 2.30.2